Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 21:58:11 +0000 (23:58 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Tue, 4 May 2010 21:58:11 +0000 (23:58 +0200)
commitf2b0c8c7e6ea432f30ac494ce296539c8cebe32f
tree3ea5158150a66a42543d27b75a8da84fcccc3c15
parent05ad24ecfb9af51145cb21c278c7ecede8280ce7
parent27936651d3e246290493e864bfc4ce271e10f955
Merge remote branch 'origin/upstream-cvs' into upstream